Catch directfb errors in gdk_colormap_new

Patch by Andre Draszik, bug 609172.

diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c
index 298013346e4d0e58866acce40eaab63ee24e1b6a..86f68da1ed3c3639eea40ab73fd340dfc0e9a97b 100644 (file)
--- a/gdk/directfb/gdkcolor-directfb.c
+++ b/gdk/directfb/gdkcolor-directfb.c
@@ -119,9 +119,16 @@ gdk_colormap_new (GdkVisual *visual,
     {
     case GDK_VISUAL_PSEUDO_COLOR:
       {
+        IDirectFB                  *dfb = _gdk_display->directfb;
+        IDirectFBPalette           *palette;
         GdkColormapPrivateDirectFB *private;
         DFBPaletteDescription       dsc;
 
+        dsc.flags = DPDESC_SIZE;
+        dsc.size  = colormap->size;
+        if (!dfb->CreatePalette (dfb, &dsc, &palette))
+          return NULL;
+
         colormap->colors = g_new0 (GdkColor, colormap->size);
 
         private = g_new0 (GdkColormapPrivateDirectFB, 1);
@@ -133,10 +140,7 @@ gdk_colormap_new (GdkVisual *visual,
             private->info[0].ref_count++;
           }
 
-        dsc.flags = DPDESC_SIZE;
-        dsc.size  = colormap->size;
-        _gdk_display->directfb->CreatePalette (
-               _gdk_display->directfb, &dsc, &private->palette);
+        private->palette = palette;
 
         colormap->windowing_data = private;